gnomeos: Pull in more X.org stuff

diff --git a/gnomeos/3.4/manifest.json b/gnomeos/3.4/manifest.json
index 53ea9dccf8cd5b389a1cc465a9a40210e1e156bc..2a86d0d7f89973bb2ab732f46130b620c10c690a 100644 (file)
--- a/gnomeos/3.4/manifest.json
+++ b/gnomeos/3.4/manifest.json
@@ -367,11 +367,22 @@
                 "patches": ["xkbcomp-autogen.patch"]},
 
                {"src": "fd:xkeyboard-config",
+                "config-opts": ["--with-xkb-rules-symlink=xorg",
+                                "--with-xkb-base=/usr/share/X11/xkb"],
                 "patches": ["xorg-autogen.patch"]},
 
                {"src": "fd:xorg/xserver",
                 "patches": ["xorg-autogen.patch"]},
 
+               {"src": "fd:xorg/driver/xf86-input-keyboard",
+                "patches": ["xorg-autogen.patch"]},
+
+               {"src": "fd:xorg/driver/xf86-input-mouse",
+                "patches": ["xorg-autogen.patch"]},
+
+               {"src": "fd:xorg/driver/xf86-input-evdev",
+                "patches": ["xorg-autogen.patch"]},
+
                {"src": "fd:xorg/driver/xf86-video-cirrus",
                 "patches": ["xorg-autogen.patch"]},
 
@@ -579,8 +590,6 @@
                 "config-opts": ["--disable-documentation"]},
 
                {"src": "gnome:gnome-bluetooth",
-                "patches": ["gnome-bluetooth-disable-docs.patch",
-                            "gnome-bluetooth-applet-la-file.patch"],
                 "config-opts": ["--disable-documentation"]},
 
                {"src": "gnome:zenity"},
@@ -649,8 +658,7 @@
                             "default-icon-theme-no-builddir.patch"]},
 
                {"src": "fd-xdg:shared-mime-info",
-                "patches": ["shared-mime-info-autogen.patch",
-                            "shared-mime-info-parallel.patch"]},
+                "patches": ["shared-mime-info-check.patch"]},
 
                {"src": "gnome:cantarell-fonts"},
 

diff --git a/gnomeos/3.4/shared-mime-info-check.patch b/gnomeos/3.4/shared-mime-info-check.patch
new file mode 100644 (file)
index 0000000..111b700
--- /dev/null
+++ b/gnomeos/3.4/shared-mime-info-check.patch
@@ -0,0 +1,53 @@
+From 9aee5e5db7bbc3ff36e73afeb4a8595981810414 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Tue, 24 Jan 2012 10:52:00 -0500
+Subject: [PATCH] Allow builders to not run make check by default
+
+Doing so breaks cross compilation, and is just plain different from
+pretty much every other module out there in the GNOME dependency stack.
+
+Furthermore, the environment needed for tests is not necessarily the
+same as that needed to just do a build.
+---
+ Makefile.am  |    7 ++++++-
+ configure.in |    6 ++++++
+ 2 files changed, 12 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 9c2c36d..bbde408 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -68,7 +68,12 @@ uninstall-hook:
+       rm -f "$(DESTDIR)$(datadir)/mime/types"
+       rm -f "$(DESTDIR)$(datadir)/mime/version"
+ 
+-all: check create-pot
++defaultmakedeps=create-pot
++if ENABLE_DEFAULT_MAKE_CHECK
++defaultmakedeps += check
++endif
++
++all: $(defaultmakedeps)
+ 
+ create-pot:
+       $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot
+diff --git a/configure.in b/configure.in
+index 0940625..2d639e6 100644
+--- a/configure.in
++++ b/configure.in
+@@ -42,6 +42,12 @@ if test "x$GCC" = "xyes"; then
+ fi
+ ]
+ 
++AC_ARG_ENABLE(default-make-check,
++   AC_HELP_STRING([--disable-default-make-check],
++                   [run make check by default [default=yes]]),,
++    enable_default_make_check=yes)
++AM_CONDITIONAL(ENABLE_DEFAULT_MAKE_CHECK, test x$enable_default_make_check = xyes)
++
+ AC_ARG_ENABLE(update-mimedb,
+    AC_HELP_STRING([--disable-update-mimedb],
+                    [disable the update-mime-database after install [default=no]]),,
+-- 
+1.7.6.5
+